cleaning up last vestiges of the terms machine and directive