Removed message log activity, didn't last long. Refactored some more.