Remove unused class and method