[MD] - datastore wrapper: Removed useless checks