remove some dead code
use name instead of spacewalk id
use system name instead of spacewalk ID, and leave OS field blank