Add generic types and more cleanup

Removing some unused methods, adding generics where possible to avoid
future mistakes, and just more cleanups of warnings.

Change-Id: Ie62206f87dc19544b9dc039faa0159fc46ebc259