Keep non conflict changes

Remove dropactivate/dropdeactivate logic but keep event bindings for the new events.