Unnecessary templates removed