removing more print statements