remove Message and friends - development moved to branch