Use --root, clean up defs