Bunch of stuff, prox, fixing...
deleted def template lines