more cleanup for back-port...think its nearly ready to go.  Just need to
log some testing time before pack/release.