Deletion WIP
Fixed delete; address PR comments