CLEAN: Fix trace and unwanted arg.