[PATCH 0/3] Remove ancient codepaths