Remove earlier attempts for "Avoid obstructions" and BorderItemLocators