Eliminating code artifact
Removing constraints to un-break passing tests