looks like this TODO can be removed