Removing even more dead refs