Cleaned Up Messaging Server