Fixed quote consistency, remove dunused index