Yeah. Unfortunately at this point I have given up. It would take too much time to dig through the game, remove any code from the scenes, make sure they are properly tracked and so on. If I had started from the beginning, it wouldn't be an issue, but sadly it's too messy to do so retroactively.