1-wire cleanups