There is going to be some amount of out-of-date information in the initial code dump from #1 which needs manual cleanup.
