Keep the integer type in sync and remove unused data members.

Change-Id: Iaaf1ebddd3b946b3211952729d41b01f0967f374