Yes, exactly on both fronts. They could have just avoided showing footage or appearances of Punk, but they put it in there anyway. Don't get me wrong, I liked the pipebomb, but damn... the ending there? Holy shit, there's an element of truth to it, but I don't think the McMahons wanted that...