remove control message stuff in favour of something simpler.