Clearpoint cleanup
Clearpoint cleanup