Removing of unused stuff in datafile

Change-Id: I44b222380e7d63bbd2f23beac3d4e6f2178f53a7
11 files changed