More TTM cleanups