removed a lengthy macro-function, since it's used only in one place
removed a lengthy macro-function, since it's used only in one place

MarginC/kame,MarginC/kame,MarginC/kame,MarginC/kame,MarginC/kame,MarginC/kame,MarginC/kame