Split restore into it's own request and tried to clean up some deadlocks