Pretend the last few commits didn't happen...

Deleted/Added files I shouldn't have for various levels of stupid
nonsense. I believe everything is current now.