ipt-toolkit release, puppi templates cleanup