weeding out old code