refactor(client) rm custom listeners