Some Cleanup (removed not needed usings, sorted usings)