Should this TODO also be removed?