Make variable removal per-section