NOREF: Now removing the template all together for now