Removing references to Motorola from APIs