NotFound creampie-cleanup