pre-CR cleanup