remove some constraints
Merge branch 'develop'