some dead code deleted