little refactoring .. there seems to be a bug with Delete List event.
Sometimes it is not triggered. Please Test!