Remove index related code for the moment.