Small message cleanup