clean up handling of quick restarts