Cleanup before switch to AdminThemModule