Cleanup for stable branch