IMO I would remove this code. We don't have plans to implement right now and our solution will likely need to work for exchange and direct so it's unlikely to follow this same implementation. We can always get the latest code from the RI again.