Removed reference to default store
Removed heath specific stuff
Added store id to observer