This TODO can be removed now