Proper image generation.
Remove obsoletes.