removed unnecessary templates