Cleanup and message fix