cleanup plus opt.