Remove legacy classes atop the Options page, and one from the Importer, as well as whitespace cleanup in the import.