Since we don't use secondary listeners anymore, we should remove the functionality from the changeset.