Removed commented code

Removed some excess commented code that was either experiments,
deprecated, or flat-out wrong.