Remove various obsolete options in the code