Remove image_tag usage