Merge "Code clean of sad4xN(_avg)_sse"