removed unused method and cleaned up imports