Cleanup some cruft in the repo

A few cleanup commits for the files in the repository.