Removed unnecessary data_files
Added TODO