removed unused class and imports