this way atleast token goes away from history. part of #844
we should remove implicit flow at some point . also #844