Remove more unnecessary debug code