get rid of old code pre-dalton completely