removed static references to os name/version/arch