Fix constraint removal

changed things up a little based on Tito's advice

Thanks, Tito!