More cleanup, yep, theres a lot of this going on!

Change-Id: If9e2b8e4b58e26ca93d0f3c29315bfa0813f9f55