Pinpoint cleanup