Less extract()
, addtl code cleanup, update deps
#7137
Merged
extract()
, addtl code cleanup, update deps
#7137