Fix id inconsistency
Remove FileStore files from repo
Ignore data folder