removd some dead code