refactoring, remove unused entries, Messager class
update simple conflict to not use state and not select random transition