Cleanup D2cri Again/Implement Optimizations