@@ Line 96: / Line 96: @@
 #[[F-370 "Talon" Class Stealth Aerospace Fighter]]
 #[[AV-380 "Raptor" Class Gunship]]
-='''Starships'''=
-=='''Tau'ri'''==
-===Starfighters===
-*[[X-301]]
-*[[X-302]]
-*[[F-302]]
-===Capital===
-*[[BC-303]]
-*[[BC-304]]
 ==='''NON-Canon Tau'ri'''===
@@ Line 136: / Line 125: @@
 *[[F-370 "Talon" Stealth Attack Aerospace Fighter]]
 *[[MC-305 “Wolverine” Transport]]
-=='''Goa'uld'''==
-===Capital===
-*[[Ha'Tak]]
-*[[Anubis' Ha'tak]]
-*[[Cheops Class Warship]]
-*[[Anubis' Mothership]]
-*[[Apophis’ Mothership]]
-===Transport===
-*[[Al'kesh]]
-*[[Tel'tak]]
-===Starfighter===
-*[[Death Glider]]
-*[[Needle Threader]]
 =='''Wraith'''==
@@ Line 163: / Line 136: @@
 *[[Wraith Scout Ship]]
 *[[Wraith Supply Ship]]
-=='''Asgard'''==
-===Capital===
-*[[Asgard Transport]]
-*[[Asgard Cruiser]]
-*[[Asgard Bomber]]
-*[[Asgard Chariot]]
-*[[Asgard Science Vessel]]
-*[[Asgard Bilskirnir-class ship]]
-*[[Asgard Oneill-class ship]]
-===Vanir===
-*[[Vanir Spaceship]]
-=='''Alteran'''==
-===Capital===
-*[[Alteran Aurora Class Battleship]]
-*[[Alteran Orion Class Battleship]]
-*[[Alteran Destroyer]]
-===Multipurpose Starships===
-*[[Alteran Gateship]]
-===Other===
-*[[Alteran City Ship]]
-=='''Asuran'''==
-===Capital===
-*[[Asuran Aurora Class Battleship]]
-===Multipurpose Starships===
-*[[Asuran Cruiser]]
-*[[Asuran Gateship]]
-===Other===
-*[[Asuran City Ship]]
-=='''Ori'''==
-===Capital Ships===
-*[[Ori Warship]]
-===Starfighters===
-*[[Ori Fighter]]
 =='''Travelers'''==
 *[[Generational Ship]]