Whitespace edits, and removed useless functionality.
More whitespace cleanups