Cleanup
Refine delivery statuses
Rename functions to better reflect OneAPI
Make OneAPI sub/unsub delivery status work