#997: Metadata cleanup

opened by njr2128