Remove unused message.py module
Clean up imports in engine.py
Fix style nit