TS cleanups