Yeah, there definitely needs to be some cleaning to be done, as to what cutscenes trigger when, or have more variations depending on what story-plots were already seen.