Removed unnecessary event emitters