Toplevel tb cleanup