Moved messages to the places they are used