Cleanup build and version bump
