ref #4203 - remove TODO's