WL-2562 Cleanup the imports.