Remove direct declaration of image\image with container