Clean up the imports to board