Remove yaml where not necessary
Minify cs-compound, #355