[DEV] Cleanup before Ogre2 switch