Remove template specific stuff