Remove extra un-needed options