Revert "Store and Battle fixes"

This reverts commit a1e6cfaa809e0ff19fee4a87e9ea6433ab849719.