5x25 - Dragon Ball Z: Dragon Box

Through the offices of Great King Yama, Goku was allowed to pass to the Next World with his body intact, so that he could undergo training. With the second wish to Shen Long, Kuririn's request to have the bombs removed from No. 17 and No. 18 bodies is granted. The next day, Gohan, Kuririn, Yamucha, and the other Z Warriors gather at the Capsule Corporation to see of Trunks, as he returns to the future.