Change class name + removing unused methods