cleaning out more legacy image stuff