Fix: trap for unreserve before cleanup