Mqtt dev

Is this something to check at later point ? if so shall we create a jira to track this?
I'm seeing to many TODOs like this in our code :) which we need to solve eventually.