removed some unused code
updated sdk extra