working on U4-5648 Remove legacy razor macro's entirely - removes lots of legacy