Simplified the Constraint removal logic