Cleaned/sorted usings

Resharper Clean Code
Updated for Demonbuddy .253 compatibility