Kill dead code
Handle mangled userdata package in extract
Yay, don't need that anymore :).