Remove defunct refernces