removed unused methods and imports