optimize imports and unused methods