Code cleanup

Removing commented out code