Remove some unnecessary constrains