Remove border entities more liberally