Remove some legacy code relating to the removed message system