Cleaning up the using statements