removed some todos and unused imports/variables