core: don't delete state data if id=nil [GH-2201]
Revert "core: better cleanup of ".vagrant"" [GH-2201]

This reverts commit 5b42994406f977907fccfdce6e85f5d32d9cd84d.