cleaning up some more TA bullshit