Clean up all of the imports