Message Scaling Cleanup