Cleanup of unused parameters.
Renaming of options.
Renaming of option
Minor cleanup of master CMakeLists.txt