Remove deprecated templates and add Activity spike template