Removed index limitations used during development