Merge "Remove deprecated APIs"