Debug message cleanup