Remove template left overs