added correct constraint removal