Tidy up the importers for a beta4 release