Minor code cleanup.

Change-Id: I42fe645a666babc27de4cb037f579f845c63f359
Reverting 'use_vips' option, not needed for current strategy.

Change-Id: Iadae824d55c0ac6d73d35239a0c99050b21d0795