Clean up includes and comments.