Add TON_ABBREVIATED, cleanup