tets cleanups