SDK Cleanup based on Shawn's feedback