Remove added context parameters no longer used.