Clean-up imports and fix example spec.