CDB-3527 small unused code cleaning while checking new code