Fixed the SDK Junits and cleaned unused code

No match.