clean_mess added