20070605 unknown: Cleaning up our big mess