fixed not removing events multiple times