Removed unnecessary Template