Removed commented out debug code