[INTERNAL] template remnants removed