added stripExtraneous on container defs