Small cleanup and flash message