Removed unneeded header includes.

Change-Id: I878c9066249116f7fb05c6736a40963bcb0e7792
Removed unneeded variable.

Change-Id: I548888e81204ba4dfcc4ebd0cb817ea83ea6f7bb
Merge branch 'minor_cleanup'

Change-Id: If36d03bfd24ce4a2b5cd8870157eed3484e93ea4