Fixed broken merge (various relicts of false message handlers)