Minor clean-up of commented out code

I was going through the source and noticed a few places where you had commented out code. Removed them in case they're no longer necessary.