Remove Tcl junk, cosmetics