Remove unused class. Refactored some stuff.