switch to classic way of image selection

a factory exist in order to help filtering and ordering the images, please make the transformations in that place instead of here (also remove the dead code).