[PATCH 03/21] Remove dead code