Remove unused handlers
Refactor api handler to make it easyer to support new functions
Implement delivery status via API queue