CPN cleanup