removing hardcoded printouts and cleaning useless includes