Cleanup undefined variable warnings

Change-Id: Icba662f5e026dcee5bc8b8acdda2bb83f896164c