Cleanup and remove debugging code.