New data file, further cleanup needed.