diff --git a/swat-codegen/PKGBUILD b/swat-codegen/PKGBUILD
index 03d8028..6fca632 100644
--- a/swat-codegen/PKGBUILD
+++ b/swat-codegen/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Zergling_man, from fedora.email
 
 pkgname=swat-codegen
-pkgver=1.0.4
+pkgver=1.0.5
 pkgrel=1
 pkgdesc="A simple CLI interface to RCPDv3, the rank code management service for the game SWAT: Aftermath"
 arch=('any')
@@ -18,4 +18,4 @@ package() {
 	chmod a+x codegen.sh
 	cp swat_* codegen.sh ${pkgdir}/opt/swat-codegen
 	ln -s /opt/swat-codegen/codegen.sh /${pkgdir}/usr/bin/rcpd
-}
\ No newline at end of file
+}
diff --git a/swat-codegen/codegen.sh b/swat-codegen/codegen.sh
index b4077ed..c08bac6 100755
--- a/swat-codegen/codegen.sh
+++ b/swat-codegen/codegen.sh
@@ -44,15 +44,15 @@ function delete_code
 function lookup
 {
 	w=
-	matches=`grep -ic "${*:2}" $loc/swat_$1`
+	matches=`grep -ic "${*:2}" $loc/$1`
 	if [ "$matches" -ne 1 ]; then
 		echo "$1 '${*:2}' is ambiguous (got $matches matches), trying whole-word match" >&2
 		# Attempt whole-word match and see if we get exactly one result (and then remember it has happened!!!)
 		w=w
-		word_matches=`grep -ic$w "${*:2}" $loc/swat_$1`
+		word_matches=`grep -ic$w "${*:2}" $loc/$1`
 		if [ "$word_matches" -ne 1 ]; then echo "still ambiguous (got $word_matches matches)" >&2; return 1; fi
 	fi
-	read $1 garbage <<< "`grep -i$w "${*:2}" $loc/swat_$1`"
+	read $1 garbage <<< "`grep -i$w "${*:2}" $loc/$1`"
 }
 
 # USER-FACING COMMANDS
@@ -102,4 +102,4 @@ function generate
 }
 
 # DO SHIT
-"$@"
\ No newline at end of file
+"$@"
diff --git a/swat-codegen/swat_armour b/swat-codegen/swat_armour
deleted file mode 100644
index 4ce8582..0000000
--- a/swat-codegen/swat_armour
+++ /dev/null
@@ -1,4 +0,0 @@
-Light
-Medium m
-Heavy h
-Advanced Cyborg Watchman
diff --git a/swat-codegen/swat_class b/swat-codegen/swat_class
deleted file mode 100644
index 014afe2..0000000
--- a/swat-codegen/swat_class
+++ /dev/null
@@ -1,12 +0,0 @@
-Sniper gs ss
-Medic
-Tactician
-Psychologist
-Maverick
-HeavyOrdnance ho
-Demolitions
-Cyborg
-Pyrotechnician
-Watchman wm
-TechOps techies
-UmbrellaClone gal alice
diff --git a/swat-codegen/swat_gun b/swat-codegen/swat_gun
deleted file mode 100644
index f49af1b..0000000
--- a/swat-codegen/swat_gun
+++ /dev/null
@@ -1,8 +0,0 @@
-AssaultRifle a ar Medic Tactician Psychologist
-SniperRifle s sr TechOps
-Chaingun c cg HeavyOrdnance Cyborg
-RocketLauncher r rl Demolitions
-Flamethrower f ft Pyrotechnician
-LaserRifle lr
-GatlingLaser gl
-Pistols fists UmbrellaClone
diff --git a/swat-codegen/swat_spec b/swat-codegen/swat_spec
deleted file mode 100644
index 92c5d53..0000000
--- a/swat-codegen/swat_spec
+++ /dev/null
@@ -1,9 +0,0 @@
-Weaponry
-PowerArmor pa
-EnergyCells
-Cybernetics
-Triage
-Chemistry
-Leadership
-Robotics
-Espionage
diff --git a/swat-codegen/swat_talent b/swat-codegen/swat_talent
deleted file mode 100644
index a6be3a0..0000000
--- a/swat-codegen/swat_talent
+++ /dev/null
@@ -1,7 +0,0 @@
-Courage crg
-Wiring
-Running
-Spotting
-Toughness
-Tinkering
-Hacking
diff --git a/swat-codegen/swat_trait b/swat-codegen/swat_trait
deleted file mode 100644
index 519e57f..0000000
--- a/swat-codegen/swat_trait
+++ /dev/null
@@ -1,16 +0,0 @@
-Skilled
-Gifted
-Survivalist
-Dragoon
-Acrobat
-SwiftLearner sl
-Healer
-FlowerChild fc
-ChemReliant cr
-RadResistant rr
-Gadgeteer
-Prowler
-Energizer energiser
-PackRat pr
-Engineer
-Reckless