Clean-up commits for PR #11

There was a few files I accidentally committed which should be in
a separate PR. This pulls them out for now.