cleanup and CV