More code cleanup.

Some more code cleanup that lead to the removal of a few options.