Unify delete method
All test pass!!!!!