CR cleanup