Don't preempt to deliver messages
Cleanup debug messages
Restructure