Cleanup

Commented-out code was removed