Refactor emonhub interface pt3

Somehow I didn't include the deletion in last commit !!