removed deprecated template code with updated code