[IMP] Improve state_cleaner