Major clean up code message systems working