fix for complex constraints
cleanup