Remove unused class and a method