Remove 'token' from usage