Remove map hue/general refactors