Code cleanup, removing debug statements

Removed comments and debug code.