more file location cleanup