removed some dead code