clean up comments and import statements