Remove old code
Fix option toggling.
Ensure lisp switches are passed in correctly.