phase1: buildfactory: remove deadcode