Support forgotten=1

And remove redundant analytic calls