Remove TODO (tracked)