Removed useless templates, little changes to others.