Clean up location field

Subtasks