some dead code removal