more cleanup, about to remove some chunks of old code