image generation cleanups * make image generation makefiles simpler * remove unused...