more auto-extraction clean up