#400 remove duplicate location field