Removing commented out and unused code

I'm not sure what our policy is about this sort of stuff, so this is a pull request to learn the policy.

@alazier @kneth