Refactored message and removed offline notification due to unreliable online/offline callback