Clean up OptionsController and ServerOptionsController, remove related redundant view files