index3 cleanup