Working pair of smoketest / smoketest_monitor
Removed dead code
Merge pull request #1 from aioTV/develop

Working pair of smoketest / smoketest_monitor