removing  code which is breaking the template
simplified setup