removing dead code, fixing guard resurrection