Quick minor scrub of legacy image functions