Remove dependency on templates; tidying.
Remove dependency on templates; tidying.

MorusAB/commonlib-fmg,MorusAB/commonlib-fmg,MorusAB/commonlib-fmg,MorusAB/commonlib-fmg,MorusAB/commonlib-fmg,MorusAB/commonlib-fmg,MorusAB/commonlib-fmg,MorusAB/commonlib-fmg