remove some dead code, check for trueheading