Linear constraints
cleanup
Merge pull request #1808 from Kenneth-T-Moore/linear

Linear