Removed unneeded variables.
Fixed unit test by using HelperObject on systems with MXLookup activated.