Remove more print statements