Made optimization to CN of deleting split mode and index searching and made changes necessary to the other files affected