More cleanup from temporary .tra