Clean up imports and unused variables