cleanup 16 code for single image testing