Remove some old vars