Fixing issues with event not removing