Cleanup
Fix fiber exit logic
Cleanup