Revert "Added D2 Stuff"

This reverts commit de4022a3665adba35d4fa32788541db3d8b8f9ad.
Merge branch 'jb-mr2' of https://github.com/IOKP/vendor_iokp into jb-mr2