removed some dead code.