Merge "Remove unused API defaults"