Cleaned up imports to reduce some memory usage