Integration cleanup