ods: dcat cleaner and generator code cleanup