But, in my opinion, a restore to factory state is a waste of time, since so many things will have to be updated/changed anyway.
Personally, I found that a recently re-installed T42 and X31 with restored original factory installs work surprisingly well. Access Connections works (F5 will switch the radios on and off), the wifi cards work, so does all the other built-in hardware such as firewire, infrared and bluetooth. Connections to various wifi networks are stable with good signal strength. I feel that the need for many updates and changes has been overhyped, and given the many threads about problems with various incarnations of Access Connections, driver incompatibilities and automated software updaters I'd be very careful about updating anything that works correctly as-is. If it isn't broken, don't try to fix it.
Similarly, why try to run Win 7 on an X31, a machine that was conceived to run Win XP ? Because the neighbours have it? Most businesses on the planet are still running XP anyway. With some additional RAM and a larger harddrive an X31 running XP can still be a perfectly capable notebook for serious work or study purposes. Just use applications from the same generation, written for XP and a single-core processor.