Added missing delete handler to procedures w/ return