Strip some dead code