Oblique WIP and metrics cleaning