Removed old messaging classes

Change-Id: Iea5cdfca8cd3ebaa2332ee7e5bd58cad1156fa8e