Merge "remove references to (unused) colortables"