Removed a lot of junk from my first pull request

I'm not sure what I did the first time. There was a lot of junk in the files that I removed. On my machine all of the targets build now.