remove repeat
fix flash messages