More Arg cleanup