Some colormap cleanup