Removed unused code
Orginized usings