Node Deletion, Refactor Stores