post cr cleanup