cleanup around the image stuff