Remove redundant index function;