Removed unused class uses