Some refactoring to save structure disabling