Clean up constant field code