Cleaned things up a little based on tito's advice
Merge pull request #9 from tito/fix_constraint_removal

Fix constraint removal