Cleanups and version bump