Implement deletion, refactor feature specs
Remove extra layer of storage abstraction