remove commented println and unused param