Remove TODO-comments and unused import