Removed a lot of redundant templates