removed gotos

2021-08-19, ivanhoe