cleaned up metadata gen components
cleaned up metadata gen components

yisiqi/cas,zawn/cas,joansmith/cas,zawn/cas,zhoffice/cas,joansmith/cas,zhoffice/cas,joansmith/cas,PetrGasparik/cas,PetrGasparik/cas,joansmith/cas,zhoffice/cas,yisiqi/cas,PetrGasparik/cas,zawn/cas,yisiqi/cas,yisiqi/cas,zawn/cas,PetrGasparik/cas,zhoffice/cas