CDB-1788 style warnings removed