At some point need to remove unused references (there are actually two now)