Cleanup

- Enabled NuGet package restore
- Miscellaneous cleanup