Made store.remove() a lot simpler