Fix #92 from  bad cleanup of dead code