- Unused code
- Disabled Metrics
- Tool bugfix