Cleanup: Remove the image specific items.