Removing unwind dependency