Updates to remove refs on elroy