Cleanup: unused imports
Fix: grammar in notification