Clean some references