Fix sequence according to todo and remove assert(0)