Cleanup and Nuget restore