Integrated image/kdata into kimage structure. Removed dead-code.