12 Commits (del-unneeded-opts)