cleanup CPE poller to use new H1:: modules