fix bug in dataStore + add warnings
Revert "fix bug in dataStore + add warnings"

This reverts commit a66b36aaa5669824798632a54403cb1ca0ebbe83.