much more cleanup for next test release...see TODO...