cleanup more templates