Works with new merge

Deleted a few files so that this would work with the pull from the
master branch