some cleanup around daemon corrupted state