ds: report + clean up in source