remove gotos temporarily