Fix constraint removal

Cleaning up after myself