Removed unused class and methods