Remove legacy variables