Merge "Remove references to (unused) colortables"