remove unused method and variables