Compatibility with p.a.w. and removing ghost indexes