Remove 500km buffer and accessibility sorting