Remove DB dependent checking for the variable

Reviewer: Tiff Go

Issue: fix to make test cases run