Remove some unused headers and code

Just some minor cleanup

Change-Id: If03f9ddc4656d0d95898005adaf12629f5df480f
Merge topic 'remove_old_unused_code' into master

58034c49 Remove some unused headers and code