Remove debugging print statements and commented-out code