fixes to remove index