am f3aaea6e: am af972a03: Clean up warnings and unused code

* commit 'f3aaea6e0955a3e2fa742e0648185f39d555f943':
  Clean up warnings and unused code