storage fixes and tweaks, remove factions integration