Import cleanup.
Add a small warining to dev versions.