WIP CP delete review

issue #15