Remove right sidebar
Fix potential race condition in simulator