aborting somehow lost the code to cleanup our state files, put that back
Rewrite to not need autodie, as that sometimes has external dependencies
Eliminate dependency on List::MoreUtils