The edit is finished, yes!
And yes, I did cut the sillier moments from both.
The caretakers appear in two scenes. First when Rey shoots the hole. You can’t cut this scene if you want to implement the deleted scene, because Luke introduces them here. The second time is in the deleted scene (caretakers village), which is an important scene for the movie I think. They work good as background characters and I don’t think they are too silly in these scenes.
The porgs are in 2-3 scenes. Maybe I could have removed more, but I like them…and my girlfriend loves them, so I would get some difficulties if I would have cut too much 😉 If you want to watch it yourself, just PM me.
I actually like the deleted scene as well. It is funny, but no overly silly in my opinion and I am glad to see it added into the film.