Move file.directory state before it's required.
Comment out potential troublemakers.