Nail: Porting the design changes from the prisoner to image tagging.
Eliminating some remnants of old designs.