Removed messaging based infrastructure