Constraint elimination - take 2

Addressed comments.