Clean up
More tidying up for release.