Remove unused class and methods