t5 cleanups