Removed commented code, this was intended for broker.
Merge pull request #1225 from ReAzem/receiverdaemon_cleanup

Removed commented code, this was intended for broker.