Merge "Remove unused interface API"