Removed all references to portability API