remove unused code and clean up method names