I think the joke I referenced was left in when I saw the episode recently but maybe they were riding it out as "Granddad is senile."
But yeah you're right that I think a lot of iffy stuff got pulled.
I wonder if the scene where Del is terrified a gay man is going to bum him has been left in, you'd be cutting the episode by about 10 minutes if not.