Remove finished TODO