Clean up old message list code