Clean up "using" statements