Simplify a lot of templates