Resolving destinations tidy-up