more cleanups
moved tokens