Update the cleaner to clean up some of the messaging and clean up error message for update situation to not keep reporting.