Cleaning up macros
Removing D stuff, putting them into their own repo