Cleaned up most of the imports to the minimum required