Removing extra templates