Clean up comments (et al.)