Revert "Map environment variables into XCCDF and modify aqueduct scripts...

... to use them."

This reverts commit f19bc7ea70747934a7765411234950bc6c023a81.