message cleanup