Updated index, removed custom