clean and update for coming change