Cleaned up the "using" statements in all the scripts