clean up comments, unused code