cr fixes removed publics