clean up comments, remove deprecated code