Code cleanup

Removed commented-out code.