more cleanup & removing unused stuff.
Merge pull request #10 from jkwatson/remove_deprecated_options

more cleanup & removing unused stuff.