[PATCH imagefactory 00/13]: Various cleanups to imagefactory