remove token code to sep file