removed unused imports
changes for latest SDK