Colormap and POM clean-up