CR feedback fixing more references and removing bad using statmenet