Cleaning up some print statements and 'dead' code