cleanup build
run restart as deferred
fix MS crashs