Cleaning up refernce cross-referenceing