Forgotten TODO removed