tokyotaitai said:
Should I remove the scene when Anakin confesses to Padme that he slaughtered the Sand People, and possibly remove Obi-Wan’s scene with Count Dooku in Geonosis?

Yep for the confession (how can Padmé marry him after that ?); keep the Dooku scene, in which there is the only mention of Jinn in Ep II, and I guess it’s important to understand Jinn had been trained by someone who has turned evil (probably after his former apprentice death), there is some kind of a pattern here (which shows that Lazy Lucas knew what is what doing, but sadly he was lacking someone to challenge him to improve his scripts).