code cleanup for name change to redistoken