Clean up double location and street