Getting rid of TI code