CDB-3696 small cleanup of dead code