remove obsolete options
beef up comments