Minor cleanup
PDIO-122 Add SystemInfo