[FIX] Correct state_cleaner