this TODO can be removed now