Remove SI dependencies in batch-notifications and payload conversion