Commit possibly incomplete cleanup

I'm still getting to grips with github, so I don't know if this pull request will work.