Cleanup for major-version-independent