Update nuget and performed code clean up. :)