CB-2606 remove empty lines