Remove constraint generation