Remove unused imports
Fix deferred call