updated Token helper
removed old modules