nuked some last Templates dependencies