before cvpr cleanup