Better garbage collection for LWM messages