fix message cleanup