#44 Removed dead code from the IDataStore