Fix cleanup_images