cleaned up imports and unused methods