Update to use ~extraction.steps.* and ~io.*
Remove dead code