Merge "Post-uapi cleanup."