Clean up print statements in code