If this code is not adequate anymore, it should be removed completely, shouldn't it?