CLEAN: Fix trace and unwanted arg.
UPGRADE: mpr