Remove unused using statements
Cleanup