CDB-4356 removal of tabs