Merge "sdm: Cleanup unused code, round 2"