Cleans up extractor/loader logic.