Remove more commented out debug code.