A few cleanups in sdk
Terrible additional hack.. that needs to be refactored hard.