Comment From: snicoll

Looking at the number of changes, I've changed my mind. It would be better to do this after the restructure work. There are a number of commits that already have removed deprecated code as part of the refactoring.