remove unnecessary debug statements and clean up existing ones