[Sprint 60] cleaning old data and change message form