messagebuilder: Capitalize "resolved"
flake8: remove unused imports