Some cleanup before pushing to Github.