Clean up comments and imports