Clearpoint cleanup