Revive argument cleaning