cleanup merge return unwind
Additional work on return_unwind