Fix usings

remove and sort using statements