Merge "Removing deprecated APIs"