diff --git a/app/Models/Client.php b/app/Models/Client.php
index 9f1906a6f123..a7d00e361954 100644
--- a/app/Models/Client.php
+++ b/app/Models/Client.php
@@ -483,7 +483,7 @@ class Client extends BaseModel implements HasLocalePreference
 
             return ClientSettings::buildClientSettings($this->company->settings, $group_settings);
         }
-nlog(CompanySettings::setProperties(ClientSettings::buildClientSettings($this->company->settings, $this->settings)));
+
         return CompanySettings::setProperties(ClientSettings::buildClientSettings($this->company->settings, $this->settings));
     }
 
diff --git a/app/Services/Pdf/PdfMock.php b/app/Services/Pdf/PdfMock.php
index 2d5ee772b1e9..510508b4bdb9 100644
--- a/app/Services/Pdf/PdfMock.php
+++ b/app/Services/Pdf/PdfMock.php
@@ -482,301 +482,7 @@ class PdfMock
     '$show_shipping_address_block' => $this->settings->show_shipping_address ? 'block' : 'none',
     '$show_shipping_address_visibility' => $this->settings->show_shipping_address ? 'visible' : 'hidden',
   ],
-  'labels' => $this->mockTranslatedLabels()
-//   [
-//     '$client.shipping_postal_code_label' => 'Shipping Postal Code',
-//     '$client.billing_postal_code_label' => 'Postal Code',
-//     '$company.city_state_postal_label' => 'City/State/Postal',
-//     '$company.postal_city_state_label' => 'Postal/City/State',
-//     '$company.postal_city_label' => 'Postal/City',
-//     '$product.gross_line_total_label' => 'Gross line total',
-//     '$client.postal_city_state_label' => 'Postal/City/State',
-//     '$client.postal_city_label' => 'Postal/City',
-//     '$client.shipping_address1_label' => 'Shipping Street',
-//     '$client.shipping_address2_label' => 'Shipping Apt/Suite',
-//     '$client.city_state_postal_label' => 'City/State/Postal',
-//     '$client.shipping_address_label' => 'Shipping Address',
-//     '$client.billing_address2_label' => 'Apt/Suite',
-//     '$client.billing_address1_label' => 'Street',
-//     '$client.shipping_country_label' => 'Shipping Country',
-//     '$invoiceninja.whitelabel_label' => '',
-//     '$client.billing_address_label' => 'Address',
-//     '$client.billing_country_label' => 'Country',
-//     '$task.gross_line_total_label' => 'Gross line total',
-//     '$contact.portal_button_label' => 'view_client_portal',
-//     '$client.shipping_state_label' => 'Shipping State/Province',
-//     '$invoice.public_notes_label' => 'Public Notes',
-//     '$client.shipping_city_label' => 'Shipping City',
-//     '$client.billing_state_label' => 'State/Province',
-//     '$product.description_label' => 'Description',
-//     '$product.product_key_label' => 'Product',
-//     '$entity.public_notes_label' => 'Public Notes',
-//     '$invoice.balance_due_label' => 'Balance Due',
-//     '$client.public_notes_label' => 'Notes',
-//     '$company.postal_code_label' => 'Postal Code',
-//     '$client.billing_city_label' => 'City',
-//     '$secondary_font_name_label' => '',
-//     '$product.line_total_label' => 'Line Total',
-//     '$product.tax_amount_label' => 'Tax',
-//     '$company.vat_number_label' => 'VAT Number',
-//     '$invoice.invoice_no_label' => 'Invoice Number',
-//     '$quote.quote_number_label' => 'Quote Number',
-//     '$client.postal_code_label' => 'Postal Code',
-//     '$contact.first_name_label' => 'First Name',
-//     '$secondary_font_url_label' => '',
-//     '$contact.signature_label' => '',
-//     '$company_logo_size_label' => '',
-//     '$product.tax_name1_label' => 'Tax',
-//     '$product.tax_name2_label' => 'Tax',
-//     '$product.tax_name3_label' => 'Tax',
-//     '$product.unit_cost_label' => 'Unit Cost',
-//     '$quote.valid_until_label' => 'Valid Until',
-//     '$custom_surcharge1_label' => '',
-//     '$custom_surcharge2_label' => '',
-//     '$custom_surcharge3_label' => '',
-//     '$custom_surcharge4_label' => '',
-//     '$quote.balance_due_label' => 'Balance Due',
-//     '$company.id_number_label' => 'ID Number',
-//     '$invoice.po_number_label' => 'PO Number',
-//     '$invoice_total_raw_label' => 'Invoice Total',
-//     '$postal_city_state_label' => 'Postal/City/State',
-//     '$client.vat_number_label' => 'VAT Number',
-//     '$city_state_postal_label' => 'City/State/Postal',
-//     '$contact.full_name_label' => 'Name',
-//     '$contact.last_name_label' => 'Last Name',
-//     '$company.country_2_label' => 'Country',
-//     '$product.product1_label' => '',
-//     '$product.product2_label' => '',
-//     '$product.product3_label' => '',
-//     '$product.product4_label' => '',
-//     '$statement_amount_label' => 'Amount',
-//     '$task.description_label' => 'Description',
-//     '$product.discount_label' => 'Discount',
-//     '$entity_issued_to_label' => 'Invoice issued to',
-//     '$assigned_to_user_label' => 'Name',
-//     '$product.quantity_label' => 'Quantity',
-//     '$total_tax_labels_label' => 'Taxes',
-//     '$total_tax_values_label' => 'Taxes',
-//     '$invoice.discount_label' => 'Discount',
-//     '$invoice.subtotal_label' => 'Subtotal',
-//     '$company.address2_label' => 'Apt/Suite',
-//     '$partial_due_date_label' => 'Due Date',
-//     '$invoice.due_date_label' => 'Due Date',
-//     '$client.id_number_label' => 'ID Number',
-//     '$credit.po_number_label' => 'PO Number',
-//     '$company.address1_label' => 'Street',
-//     '$credit.credit_no_label' => 'Invoice Number',
-//     '$invoice.datetime_label' => 'Date',
-//     '$contact.custom1_label' => '',
-//     '$contact.custom2_label' => '',
-//     '$contact.custom3_label' => '',
-//     '$contact.custom4_label' => '',
-//     '$task.line_total_label' => 'Line Total',
-//     '$line_tax_labels_label' => 'Taxes',
-//     '$line_tax_values_label' => 'Taxes',
-//     '$secondary_color_label' => '',
-//     '$invoice.balance_label' => 'Balance',
-//     '$invoice.custom1_label' => '',
-//     '$invoice.custom2_label' => '',
-//     '$invoice.custom3_label' => '',
-//     '$invoice.custom4_label' => '',
-//     '$company.custom1_label' => '',
-//     '$company.custom2_label' => '',
-//     '$company.custom3_label' => '',
-//     '$company.custom4_label' => '',
-//     '$quote.po_number_label' => 'PO Number',
-//     '$company.website_label' => 'Website',
-//     '$balance_due_raw_label' => 'Balance Due',
-//     '$entity.datetime_label' => 'Date',
-//     '$credit.datetime_label' => 'Date',
-//     '$client.address2_label' => 'Apt/Suite',
-//     '$client.address1_label' => 'Street',
-//     '$user.first_name_label' => 'First Name',
-//     '$created_by_user_label' => 'Name',
-//     '$client.currency_label' => '',
-//     '$company.country_label' => 'Country',
-//     '$company.address_label' => 'Address',
-//     '$tech_hero_image_label' => '',
-//     '$task.tax_name1_label' => 'Tax',
-//     '$task.tax_name2_label' => 'Tax',
-//     '$task.tax_name3_label' => 'Tax',
-//     '$client.balance_label' => 'Account balance',
-//     '$client_balance_label' => 'Account balance',
-//     '$credit.balance_label' => 'Balance',
-//     '$credit_balance_label' => 'Credit Balance',
-//     '$gross_subtotal_label' => 'Subtotal',
-//     '$invoice.amount_label' => 'Total',
-//     '$client.custom1_label' => '',
-//     '$client.custom2_label' => '',
-//     '$client.custom3_label' => '',
-//     '$client.custom4_label' => '',
-//     '$emailSignature_label' => '',
-//     '$invoice.number_label' => 'Invoice Number',
-//     '$quote.quote_no_label' => 'Quote Number',
-//     '$quote.datetime_label' => 'Date',
-//     '$client_address_label' => 'Address',
-//     '$client.address_label' => 'Address',
-//     '$payment_button_label' => 'Pay Now',
-//     '$payment_qrcode_label' => 'Pay Now',
-//     '$client.country_label' => 'Country',
-//     '$user.last_name_label' => 'Last Name',
-//     '$client.website_label' => 'Website',
-//     '$dir_text_align_label' => '',
-//     '$entity_images_label' => '',
-//     '$task.discount_label' => 'Discount',
-//     '$contact.email_label' => 'Email',
-//     '$primary_color_label' => '',
-//     '$credit_amount_label' => 'Credit Amount',
-//     '$invoice.total_label' => 'Invoice Total',
-//     '$invoice.taxes_label' => 'Taxes',
-//     '$quote.custom1_label' => '',
-//     '$quote.custom2_label' => '',
-//     '$quote.custom3_label' => '',
-//     '$quote.custom4_label' => '',
-//     '$company.email_label' => 'Email',
-//     '$client.number_label' => 'Number',
-//     '$company.phone_label' => 'Phone',
-//     '$company.state_label' => 'State/Province',
-//     '$credit.number_label' => 'Credit Number',
-//     '$entity_number_label' => 'Invoice Number',
-//     '$credit_number_label' => 'Invoice Number',
-//     '$global_margin_label' => '',
-//     '$contact.phone_label' => 'Phone',
-//     '$portal_button_label' => 'view_client_portal',
-//     '$paymentButton_label' => 'Pay Now',
-//     '$entity_footer_label' => '',
-//     '$client.lang_2_label' => '',
-//     '$product.date_label' => 'Date',
-//     '$client.email_label' => 'Email',
-//     '$product.item_label' => 'Item',
-//     '$public_notes_label' => 'Public Notes',
-//     '$task.service_label' => 'Service',
-//     '$credit.total_label' => 'Credit Total',
-//     '$net_subtotal_label' => 'Net',
-//     '$paid_to_date_label' => 'Paid to Date',
-//     '$quote.amount_label' => 'Quote Total',
-//     '$company.city_label' => 'City',
-//     '$payment.date_label' => 'Payment Date',
-//     '$client.phone_label' => 'Phone',
-//     '$number_short_label' => 'Invoice #',
-//     '$quote.number_label' => 'Quote Number',
-//     '$invoice.date_label' => 'Invoice Date',
-//     '$company.name_label' => 'Company Name',
-//     '$portalButton_label' => 'view_client_portal',
-//     '$contact.name_label' => 'Contact Name',
-//     '$entity.terms_label' => 'Invoice Terms',
-//     '$client.state_label' => 'State/Province',
-//     '$company.logo_label' => 'Logo',
-//     '$company_logo_label' => 'Logo',
-//     '$payment_link_label' => 'Pay Now',
-//     '$status_logo_label' => '',
-//     '$description_label' => 'Description',
-//     '$product.tax_label' => 'Tax',
-//     '$valid_until_label' => 'Valid Until',
-//     '$your_entity_label' => 'Your Invoice',
-//     '$shipping_label' => 'Shipping',
-//     '$balance_due_label' => 'Balance Due',
-//     '$outstanding_label' => 'Balance Due',
-//     '$partial_due_label' => 'Partial Due',
-//     '$quote.total_label' => 'Total',
-//     '$payment_due_label' => 'Payment due',
-//     '$credit.date_label' => 'Credit Date',
-//     '$invoiceDate_label' => 'Invoice Date',
-//     '$view_button_label' => 'View Invoice',
-//     '$client.city_label' => 'City',
-//     '$spc_qr_code_label' => '',
-//     '$client_name_label' => 'Client Name',
-//     '$client.name_label' => 'Client Name',
-//     '$paymentLink_label' => 'Pay Now',
-//     '$payment_url_label' => 'Pay Now',
-//     '$page_layout_label' => '',
-//     '$task.task1_label' => '',
-//     '$task.task2_label' => '',
-//     '$task.task3_label' => '',
-//     '$task.task4_label' => '',
-//     '$task.hours_label' => 'Hours',
-//     '$amount_due_label' => 'Amount due',
-//     '$amount_raw_label' => 'Amount',
-//     '$invoice_no_label' => 'Invoice Number',
-//     '$quote.date_label' => 'Quote Date',
-//     '$vat_number_label' => 'VAT Number',
-//     '$viewButton_label' => 'View Invoice',
-//     '$portal_url_label' => '',
-//     '$task.date_label' => 'Date',
-//     '$task.rate_label' => 'Rate',
-//     '$task.cost_label' => 'Rate',
-//     '$statement_label' => 'Statement',
-//     '$user_iban_label' => '',
-//     '$signature_label' => '',
-//     '$id_number_label' => 'ID Number',
-//     '$credit_no_label' => 'Invoice Number',
-//     '$font_size_label' => '',
-//     '$view_link_label' => 'View Invoice',
-//     '$page_size_label' => '',
-//     '$country_2_label' => 'Country',
-//     '$firstName_label' => 'First Name',
-//     '$user.name_label' => 'Name',
-//     '$font_name_label' => '',
-//     '$auto_bill_label' => '',
-//     '$payments_label' => 'Payments',
-//     '$task.tax_label' => 'Tax',
-//     '$discount_label' => 'Discount',
-//     '$subtotal_label' => 'Subtotal',
-//     '$company1_label' => '',
-//     '$company2_label' => '',
-//     '$company3_label' => '',
-//     '$company4_label' => '',
-//     '$due_date_label' => 'Due Date',
-//     '$poNumber_label' => 'PO Number',
-//     '$quote_no_label' => 'Quote Number',
-//     '$address2_label' => 'Apt/Suite',
-//     '$address1_label' => 'Street',
-//     '$viewLink_label' => 'View Invoice',
-//     '$autoBill_label' => '',
-//     '$view_url_label' => 'View Invoice',
-//     '$font_url_label' => '',
-//     '$details_label' => 'Details',
-//     '$balance_label' => 'Balance',
-//     '$partial_label' => 'Partial Due',
-//     '$client1_label' => '',
-//     '$client2_label' => '',
-//     '$client3_label' => '',
-//     '$client4_label' => '',
-//     '$dueDate_label' => 'Due Date',
-//     '$invoice_label' => 'Invoice Number',
-//     '$account_label' => 'Company Name',
-//     '$country_label' => 'Country',
-//     '$contact_label' => 'Name',
-//     '$app_url_label' => '',
-//     '$website_label' => 'Website',
-//     '$entity_label' => 'Invoice',
-//     '$thanks_label' => 'Thanks',
-//     '$amount_label' => 'Total',
-//     '$method_label' => 'Method',
-//     '$number_label' => 'Invoice Number',
-//     '$footer_label' => '',
-//     '$client_label' => 'Client Name',
-//     '$email_label' => 'Email',
-//     '$notes_label' => 'Public Notes',
-//     '_rate1_label' => 'Tax',
-//     '_rate2_label' => 'Tax',
-//     '_rate3_label' => 'Tax',
-//     '$taxes_label' => 'Taxes',
-//     '$total_label' => 'Total',
-//     '$phone_label' => 'Phone',
-//     '$terms_label' => 'Invoice Terms',
-//     '$from_label' => 'From',
-//     '$item_label' => 'Item',
-//     '$date_label' => 'Invoice Date',
-//     '$tax_label' => 'Tax',
-//     '$dir_label' => '',
-//     '$to_label' => 'To',
-//     '$show_paid_stamp_label' => '',
-//     '$status_logo_label' => '',
-//     '$show_shipping_address_label' => '',
-//     '$show_shipping_address_block_label' => '',
-//     '$show_shipping_address_visibility_label' => '',
-//   ],
+  'labels' => $this->mockTranslatedLabels(),
 ];
     }