removed some cruft from the messaging objects