Just some cleanup

This isnt even all of it, but its time for bed
so I will finish this more tomorrow or near the
end of the week when I have more time.

Change-Id: I7c200058a1d75ce1aea444992b82864217518a0f