Removed Proxmity trait everywhere

as discussed in #2617.