Vehicle spawn cleanup

Found two instances of one file so I removed one and cascaded the change
across the tool.
Removed unneeded code in the vehicle spawns.