dropped a few redundant constraints