Clean up some other templates