Remove some old options that aren't being used anymore