Remove legacy image code