Merge change 25673 into eclair

* changes:
  fix some places where we did not clean all data for removed accounts