Removed usused and sorted usings