[PATCH imagefactory 0/5]: More cleanups