Removed commented debug code