Removed some debug code.
Also removed unused comments.