Cleanup, Messages refactoring