removed message handler, combined with node