remove println statements and commented code