remove goto for now