[RFC PATCH 4/5] Remove dead code