CR - cleanup