Refactoring useless constraints