clean up comments and extras