Bump version and did some cleanup.