Further uicolor removal