Cleanup some using statements