Full device cleanup

Patch set 2:  Oops, lol, those are tabs, not spaces

Patch set 3:  Yeah, sorry, title fixed.  lol

Change-Id: I3e1ef4adcc81cc83878ffcaf04345f52d3edb748