More cleanup and version bump