Commented some debug code.
Removed redundant code.