Removed some Options that weren't in use