Remove some comments and print statements