Cleanup and version bump