Add additional reference tags, drop some now-redundant clones