Fixed incomplete removal of TA