Remove deprecated kwarg and undefined variable.