Fix dead references