Attempt to simplify stores
Cleanup