We only really support the 'plain' type. Remove all the conditions on image type and remove 'plain' from all target and file names.