update ipt to indicators and clean up