fixing cp leftover