Clean Up Old Comments and Commented-Out Code

If any of these removed chunks are important, I'll gladly revert them!