Revert "Extracted more constants, added print functions to MessageSender"

This reverts commit c20800cf16b17f3e2e1754aead20af748eebedf6.