Add "Do not remove this line!" warning next to AFC templates; reshuffle removals, handle optional data better