Remove un-needed options