kill some old 16 bit column indices

Change-Id: Ie1c3f3b11ed216b53f3fd385614f6fcb2c38220c