Implemented delete and remove functions