Remove exported variables

&& squishes a couple other issues too.