remove "goto"