How do I remove unwanted commas in OTBI report output

Summary:

Custom address field column contains extra columns when source column is null

Content (please ensure you mask any confidential information):

I have created an OTBI report with a custom column to output the address. The column looks at the address columns, Address1, Address2, Address3, City, County, Postcode and concatenates them into a single column with a comma between each. When one or more columns is null I end up with multiple commas together which makes the output look poor. Is there a way to supress them?

Version (include the version you are using, if applicable):

Code Snippet (add any code snippets that support your topic, if applicable):