Fixed cleanup messages to account for internationalization