Convert delete handler to new logic