[PATCH 0/1] Patch removing some dead code