More cleanup
Add latest Messages.h