Clean up imports and make them private.