Enhancement/remove script indexes (#891)