1. fix deadlocks
2. add retry timer (15 seconds hardcoded for now)
3. remove dead code