refactor over dead code