Remove hard-wired options