Clean out non-standard options