Removed unused classed