More To2 and remove commented garbage code