finish weeding out old code