Zebra.i7x cleanup