massive simplification of T1 code