Cleanup of switches in options.h