Remove (or correct) TODO