Code cleanup

Removed old commented stuff.