Cleanup if and unbound helper