wip: cleanup other uses of $$phase