Remove the fields that are null since CFN doesn't like null outputs