switch message types to iota, clean up previous commit