DELETE implemented. Refactored objectstore to remove redundancy.