Drop unnecessary #includes

Change-Id: Ib286fa65ee54a09a78686b8b11453228c4196910
Remove an unused inline function

Change-Id: I52a5b2d7d3302ba887364e7bf5b377bf93394406