Remove availableStore, move stuff into regular stores