Refactored delete all