removed message stuff