Clean Up Old Comments and Commented-Out Code

If any of these removed chunks are important, I'll gladly revert them!
Yeah, those parentheses aren't necessary.  I should a comment daring someone to remove them! :wink: