Cleanup for release & version bump