Fixed remove events
merge conflicts