Removing TODO and unused imports