more indexes fixed and remove deprecated DR stuff