Don't flush on file creation but flush when the DataManager is disposed
Removed obsolete comment