Clean up comments and logging code