fix unset filter when restarting, removing dead code, avaid double event when removing cluster