Make getting the fileclient a bit more robust and remove unused PILLAR var.