50d9f32506
Merge commit '33460d836fc2a062290d72ebcfb73af51ffa9c36' * commit '33460d836fc2a062290d72ebcfb73af51ffa9c36': SDP: remove dead code.