TPSE cleanup