Can't we simply kill that code now?