kill remaining calls to extract()

Change-Id: I67bd5c2d1f6662a6035266320b9d6bc833192177
Merge "kill remaining calls to extract()"