[PATCH 09/13] Remove dead code