Removed the references to the abstract stores.