Clean up print statements