Disabled all macros
Ready for merging back to master