Cleanup
Convert field injection to constructor injection
Add missing message properties
Remove unused message properties