Remove seperate $unwind block