decent cleamup of hardware.py, nightly checkin