Delete Templates + minor tweaks