Cleans up store related classes
6 files changed