Use slices.Compact instead of own logic

Use slices.Compact instead of own logic #2909