Fixed message text and removed data persisting