Cleanup

Cleaned up unneeded files. There also may be some code changes from the
last version. We accidentally made changes without updating to the
newest version first. So if you are missing info, please refer to
previous commits.