more index 3 cleanup