Cleaning up output paths
Metrics accumulation issue fixed