Don't try to remove an empty list of variables/constraints
Merge branch 'speedup' into devel