Cleanup units, by moving them to yaml.