clean up: removed unnecessary contraints, dead code