More clean up for post landing TI calls