cleanup of of 1w polling code