More EFS clean ups