refactor t/l, reduce code

not backwards compatibility,