Kill 'source image' concept for good