Strip Down Complete...

There is more work to do, but the initial cleanup is done. I will create some other issues to cover some other things I noticed along the way and move forward from there.