Crazy cleanup...

PS2:  Fixed the build.  All good now

Change-Id: Id4774e45f2d3ab85d412ff9cfc09d439470dd8a3