Merge "Remove defaults that add nothing"