cleanup cr fixes