remove static properties from index factory, formatting