Total overhaul
Delete template