took out a few more print statements