Update boneyard handling with removal of Elite prefixes