add on workaround class is never used in any template. Removed