Revert "cleanup unused in constraints"
Revert "cleanup unused in constraints"

This reverts commit 7d2fb359bc28fdce6b5037629e1184bbb977a809.

danaukes/popupcad,Skylion007/popupcad,Skylion007/popupcad,danaukes/popupcad