Cleaning up store model instantiations