Removed redundant db query
PLAT-2091