bit more cleaning: imports and unused variables