t4 cleanups