Remove unused code
Removing code
Remove unnecessary code
Refactoring
Refactoring... a few tests still fail because of the way composite tasks reference rule IDs