Remove label and label separator
Add check for image enlarge dimensions to be smaller than image-size