969529 - Remove the content-unit option in addition to the type option