Remove todo in user and unused import