remove some of the macros

Xaver Huglrequested to merge
work/zamundaaa/macros into master

It's not 1990 anymore, having a few more lines of code is okay, and plays nicer with IDEs.

Merge request reports