Remove hardcoded db indexes