cleanup and SendMessage consistency