Slimmed down Expert store initialization

Change-Id: Ief8668d6935b2149ebe6902a7ec97f0741515577