Remove unused imports
Update samples