Removed unused properties and added width and height in image metadata CND.