You need to remove Greedo in the Cantina as this was a re-shoot to pair everything down then. I prefer the way it was done without the Jabba scene in terms how the handled it though.
No, definitely no.
The Cantina scene with Greedo is in the fourth script (Jan.1976)
Yeah, the Greedo cantina scene not a reshoot - when the Jabba scene was cut, the dialgoue in the Greedo scene was altered (by changing Greedo’s subtitles and lifting a Han line directly from the Jabba scene) to give the same information that the Jabba scene did. When they restored the Jabba scene in 1997, though, they forgot to revert the Greedo scene back to its originally-filmed state.
From the shooting script (March 1976 revised fourth draft):
ALIEN
Going somewhere, Solo?HAN
As a matter of fact, I was just going to see your boss. Tell Jabba that I have his money.ALIEN
That’s what you said yesterday, but it’s too late… I’m not going back to Jabba with another one of your stories.HAN
But I’ve got the money this time!ALIEN
Then I’ll take it now.Han sits down and the alien sits across from him holding the gun on him.
HAN
I haven’t got it here with me. Tell Jabba…ALIEN
It’s too late I think. Jabba would rather have your ship.HAN
Over my dead body.
ALIEN
That’s the idea, Solo. You will come outside with me or must I finish it here?HAN
I don’t think they’d like another killing in here.ALIEN
They’d hardly notice… get up. I’ve been looking forward to this for a long time…HAN
I bet you have…Suddenly the slimy alien disappears in a blinding flash of light. Han pulls his smoking gun from beneath the table as the other patrons look on in bemused amazement.
HAN
…but it will take a lot more than the likes of you to finish me off…Han gets up and starts out of the cantina, flipping the bartender some coins as he leaves.
HAN
Sorry for the mess…
Notice Greedo never says “Jabba has no time for smugglers who drop their shipments” yadda yadda (Jabba dialogue), and no “Even I get boarded sometimes, do you think I had a choice?” from Han, which is the line lifted directly from the Jabba scene (it’s the exact same take used in both scenes in the 1997/2004/2011/2019 versions).
As scripted and filmed, the Greedo and Jabba scene were both meant to be in the film. When they cut the one, they modified the other to make sure no information was lost.