migrate to fa4, cleanup index for consistency