Added better delete handler.