Make sure CDX file is sorted.

Turns out the CDX file has to be sorted alphabetically. (I also removed a couple of unused imports.)